Fix more re-used embedded docs issues #1550
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
malarzm
commented
Jan 9, 2017
| @@ -745,16 +745,6 @@ private function computeOrRecomputeChangeSet(ClassMetadata $class, $document, $r | |||
| if ($orgValue !== null) { | |||
| $this->scheduleOrphanRemoval($orgValue); | |||
| } | |||
|
|
|||
| if ($actualValue !== null) { | |||
There was a problem hiding this comment.
This is #1542 removed because it was good only for updates (it's in the path when document is not new) while one of tests I've added was interested in fixing inserts
malarzm
commented
Jan 9, 2017
| @@ -998,6 +988,10 @@ private function computeAssociationChanges($parentDocument, array $assoc, $value | |||
| if ($assoc['type'] === ClassMetadata::ONE) { | |||
| $class->setFieldValue($parentDocument, $assoc['fieldName'], $entry); | |||
| $this->setOriginalDocumentProperty(spl_object_hash($parentDocument), $assoc['fieldName'], $entry); | |||
| $poid = spl_object_hash($parentDocument); | |||
| if (isset($this->documentChangeSets[$poid][$assoc['fieldName']])) { | |||
| $this->documentChangeSets[$poid][$assoc['fieldName']][1] = $entry; | |||
There was a problem hiding this comment.
This fixed #1542's failing test case and new one with early persist
malarzm
commented
Jan 9, 2017
| if ($knownParent && $knownParent !== $document) { | ||
| $relatedDocuments = clone $relatedDocuments; | ||
| $class->setFieldValue($document, $mapping['fieldName'], $relatedDocuments); | ||
| } |
There was a problem hiding this comment.
This however I fail to see why I need to bring back but without this change set test with late persist is failing for reason I don't see yet
|
Thanks @malarzm ! I've removed the |
alcaeus
approved these changes
Jan 10, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'll comment on changes separately but as for now failing test case @redthor has provided in #1525 is fixed